diff --git a/application/models/Item.php b/application/models/Item.php
index 8cf8ea086..c223e3d17 100644
--- a/application/models/Item.php
+++ b/application/models/Item.php
@@ -600,7 +600,7 @@ class Item extends CI_Model
 	public function get_stock_search_suggestions($search, $filters = array('is_deleted' => FALSE, 'search_custom' => FALSE), $unique = FALSE, $limit = 25)
 	{
 		$suggestions = array();
-		$non_kit = array(ITEM, ITEM_PRICE_BASED);
+		$non_kit = array(ITEM, ITEM_AMOUNT_ENTRY);
 
 		$this->db->select($this->get_search_suggestion_format('item_id, name'));
 		$this->db->from('items');
@@ -710,7 +710,7 @@ class Item extends CI_Model
 	public function get_kit_search_suggestions($search, $filters = array('is_deleted' => FALSE, 'search_custom' => FALSE), $unique = FALSE, $limit = 25)
 	{
 		$suggestions = array();
-		$non_kit = array(ITEM, ITEM_PRICE_BASED);
+		$non_kit = array(ITEM, ITEM_AMOUNT_ENTRY);
 
 		$this->db->select('item_id, name');
 		$this->db->from('items');
diff --git a/application/views/sales/quote.php b/application/views/sales/quote.php
index 282f81933..b83da481b 100644
--- a/application/views/sales/quote.php
+++ b/application/views/sales/quote.php
@@ -178,6 +178,13 @@ if (isset($error_message))
 		}
 		?>
 	</table>
+	<div id="terms">
+		<div id="sale_return_policy">
+			<h5>
+				<textarea rows="5" cols="6"><?php echo $this->lang->line('sales_comments'). ': ' . (empty($comments) ? $this->config->item('invoice_default_comments') : $comments); ?></textarea>
+			</h5>
+		</div>
+	</div>
 </div>
 
 <script type="text/javascript">