diff --git a/application/extensions/TopbarWidget/views/includes/editQuestionTopbarLeft_view.php b/application/extensions/TopbarWidget/views/includes/editQuestionTopbarLeft_view.php
index 7ef048b061e..36196f8d2ca 100644
--- a/application/extensions/TopbarWidget/views/includes/editQuestionTopbarLeft_view.php
+++ b/application/extensions/TopbarWidget/views/includes/editQuestionTopbarLeft_view.php
@@ -92,7 +92,7 @@
     <!-- Import -->
     <?php if($hasSurveyContentCreatePermission):?>
         <?php if($oSurvey->active!='Y'): ?>
-            <a class="btn btn-default" id="import-button" href="<?php echo Yii::App()->createUrl("questionAdministration/importView/surveyid/$surveyid"); ?>" role="button">
+            <a class="btn btn-default" id="import-button" href="<?php echo Yii::App()->createUrl("questionAdministration/importView", ["surveyid" => $surveyid, "groupid" => $gid]); ?>" role="button">
                 <span class="icon-import icon"></span>
                 <?php eT("Import question"); ?>
             </a>
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
index 3005df866e1..33697cdc867 100644
--- a/application/helpers/admin/import_helper.php
+++ b/application/helpers/admin/import_helper.php
@@ -651,10 +651,11 @@ function XMLImportQuestion($sFullFilePath, $iNewSID, $iNewGID, $options = array(
 
             switchMSSQLIdentityInsert('questions', false);
             $aQIDReplacements[$iOldQID] = $oQuestion->qid;
+
+            $newqid = $oQuestion->qid;
         }
 
         $results['questions'] = isset($results['questions']) ? $results['questions'] + 1 : 1;
-        $newqid = $oQuestion->qid;
 
         if (isset($oQuestionL10n)) {
             $oQuestionL10n->qid = $aQIDReplacements[$iOldQID];