diff --git a/packages/survey/www/admin/question-add-3-postgresql.xql b/packages/survey/www/admin/question-add-3-postgresql.xql
index e7cfb6b..8029b59 100644
--- a/packages/survey/www/admin/question-add-3-postgresql.xql
+++ b/packages/survey/www/admin/question-add-3-postgresql.xql
@@ -27,7 +27,7 @@

 <fullquery name="get_choice_id">
       <querytext>
-      select survey_choice_id_sequence.nextval as choice_id
+      select nextval as choice_id from survey_choice_id_sequence
       </querytext>
 </fullquery>

diff --git a/packages/survey/www/admin/question-add-3.tcl b/packages/survey/www/admin/question-add-3.tcl
index 8cc4803..e1f01b7 100644
--- a/packages/survey/www/admin/question-add-3.tcl
+++ b/packages/survey/www/admin/question-add-3.tcl
@@ -105,7 +105,10 @@ if { $already_inserted_p } {
            set sort_order [expr { $after + 1 }]
            db_dml renumber_sort_orders {}
        } else {
-           set sort_order [expr {[db_string max_question {}] + 1}]
+           set sort_order [db_string max_question {}]
+           if { $sort_order eq ""} {
+               set sort_order 1
+           }
        }

        db_exec_plsql create_question {}