diff --git a/admin/woocommerce-admin-taxonomies.php b/admin/woocommerce-admin-taxonomies.php
index 7fb66cae64b..a1a48f81598 100644
--- a/admin/woocommerce-admin-taxonomies.php
+++ b/admin/woocommerce-admin-taxonomies.php
@@ -28,6 +28,8 @@ function woocommerce_add_category_thumbnail_field() {
 		</div>
 		<script type="text/javascript">
 			
+			window.send_to_editor_default = window.send_to_editor;
+
 			window.send_to_termmeta = function(html) {
 				
 				jQuery('body').append('<div id="temp_image">' + html + '</div>');
@@ -43,6 +45,8 @@ function woocommerce_add_category_thumbnail_field() {
 				jQuery('#temp_image').remove();
 				
 				tb_remove();
+				
+				window.send_to_editor = window.send_to_editor_default;
 			}
 			
 			jQuery('.upload_image_button').live('click', function(){
diff --git a/woocommerce-ajax.php b/woocommerce-ajax.php
index 1386073469d..24b996954f5 100644
--- a/woocommerce-ajax.php
+++ b/woocommerce-ajax.php
@@ -875,7 +875,7 @@ function woocommerce_json_search_products( $x = '', $post_types = array('product
 	
 	if (empty($term)) die();
 	
-	if (is_numeric($term)) {
+	if ( is_numeric( $term ) ) {
 		
 		$args = array(
 			'post_type'			=> $post_types,
@@ -885,7 +885,15 @@ function woocommerce_json_search_products( $x = '', $post_types = array('product
 			'fields'			=> 'ids'
 		);
 		
-		$posts = get_posts( $args );
+		$args2 = array(
+			'post_type'			=> $post_types,
+			'post_status'	 	=> 'publish',
+			'posts_per_page' 	=> -1,
+			'post_parent' 		=> $term,
+			'fields'			=> 'ids'
+		);
+		
+		$posts = array_unique(array_merge( get_posts( $args ), get_posts( $args2 ) ));
 		
 	} else {
 	
diff --git a/woocommerce.php b/woocommerce.php
index f5ec2c4ae49..f300dd83747 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -16,7 +16,7 @@
  * @category Core
  * @author WooThemes
  */
- 
+
 if ( !defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
 if ( !class_exists( 'Woocommerce' ) ) {