diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 2c56a64c..31fa6b9d 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -33,7 +33,7 @@ class Origami::SurveysController < BaseOrigamiController
 	       @table_type       = @dining_facility.type
 	       @receipt_no       = nil
 	       @grand_total      = nil
-	       @survey_data  	 = Survey.find_by_dining_name(@dining_facility.name)
+	       @survey_data  	 = Survey.find_by_dining_name_and_receipt_no(@dining_facility.name,"")
 	    end 
 	end
 
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 523e88c3..eddb275d 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -34,8 +34,8 @@
             <%= f.input :local , input_html: { value: @survey_data.local, class: 'col-md-11', :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyLocal(this.value);" }%>
             <!--<fieldset style="border: 1px solid #BDBDBD;padding: 20px; width: 92%;margin: 20px 0 20px 0;"> -->
               <!-- <legend style="font-size: 1.2em !important;font-weight: bold !important;text-align: left !important;border:none;width:100px;">Foreigner</legend> -->
-            <fieldset class="form-group">
-              <label class="bmd-label-static">Foreigner Lists</label>
+            <fieldset style="border: 1px solid #BDBDBD;padding: 20px; width: 92%;margin: 20px 0 20px 0;">
+              <legend style="font-size: 1.2em !important;font-weight: bold !important;text-align: left !important;border:none;width:100px;">Foreigner</legend>
               <div class="row clearfix foreignerDiv">
                 <div class="col-lg-5 col-md-5 col-sm-5 col-xs-5">
                   <div class="form-group p-l-10 p-r-10">