diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 7967f8a1..9001bae3 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -78,12 +78,15 @@ $(document).on('turbolinks:load', function() {
 					}
 	            }
 
-	            	if (data[field]["table_type"]=null) {
-	            		table_type = data[field]["table_type"] +'-'+data[field]["zone"]
-	            	}else{
-	            		table_type = "No Table"
-	            		
-	            	}
+	            var table_type = '';
+
+            	if (data[field]["table_type"]=null) {
+            		table_type = data[field]["table_type"] +'-'+data[field]["zone"]
+            	}else{
+            		table_type = "No Table"
+            		
+            	}
+
 	            row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
 	                    +'<div class="card-block">'
 	                         +'<div class="row">'
@@ -155,7 +158,7 @@ $(document).on('turbolinks:load', function() {
 	    		for (i = 0; i < res["items"].length; i++) {	    			
 	    			var data = JSON.stringify(res["items"][i]);	
         			var parse_data = JSON.parse(data); 
-        			var assigned_order_items = {}; 
+        			var assigned_order_items = []; 
         			var assigned_order_item_id = '';
         			if(res["assigned_order_items"]!= undefined && res["assigned_order_items"]!=''){
         				assigned_order_items = JSON.parse(JSON.stringify(res["assigned_order_items"]));
@@ -178,10 +181,18 @@ $(document).on('turbolinks:load', function() {
         			}
 
         			if (oqs_id > 0){
-        				var order_item_row = "<tr id='edit_"+assigned_order_item_id+"' class='order-item-edit'>" +
-							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
-							                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
-              						 	 "</tr>";
+        				if(assigned_order_item_id != ''){
+        					var order_item_row = "<tr id='edit_"+assigned_order_item_id+"' class='order-item-edit'>" +
+									                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
+									                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
+		              						 	 "</tr>";
+					 	}else{
+					 		var order_item_row = "<tr>" +
+									                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
+									                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
+												"</tr>";
+					 	}
+        				
 				 	}else{
 				 		var order_item_row = "<tr>" +
 							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +