 `products`.`product_class_id` AS `product-class-id`,
 `categories_products`.`category_id` AS `category-id`,
 `categories`.`parent_id` AS `category-parent-id`,
-`solr_categories`.`category_ids` AS `category-ids`,
-`solr_categories`.`category_path` AS `category-path`,
-`solr_service_centers`.`service_center_ids` AS `service-center-ids`,
+`search_categories`.`category_ids` AS `category-ids`,
+`search_categories`.`category_path` AS `category-path`,
+`search_service_centers`.`service_center_ids` AS `service-center-ids`,
 IFNULL(`products`.`step_title`,`products`.`name`) AS `name`,
 IFNULL(`products`.`step_description`,`products`.`long_description`) AS `description`,
 `products`.`upc` AS `upc`,

  ON (`products`.`id` = `external_files`.`product_id` and `external_files`.`type` = 'image')
LEFT JOIN `categories_products`
ON (`products`.`id` = `categories_products`.`product_id`)
LEFT JOIN `solr_categories`
ON (`categories_products`.`category_id` = `solr_categories`.`category_id`)
LEFT JOIN `product_classes`
ON (`products`.`product_class_id` = `product_classes`.`id`)
LEFT JOIN `solr_service_centers`
ON (`products`.`id` = `solr_service_centers`.`product_id`)
LEFT JOIN `manufacturers`
ON (`products`.`manufacturer_id` = `manufacturers`.`id`)
LEFT JOIN `categories`

 FROM `category_hierarchies`
 GROUP BY 1
 HAVING MAX(`category_hierarchies`.`generations`) = 0
 ) AS `leaves`
ON (`categories`.`id` = `leaves`.`ancestor_id`)
INNER JOIN
(
 SELECT `stock_statuses`.`product_id` as `product_id`, SUM(`stock_statuses`.`eod_qty`) as `eod_qty`
 FROM `stock_statuses`
 GROUP BY `stock_statuses`.`product_id`
 ) AS `ss`
ON (`products`.`id` = `ss`.`product_id`)
;
")

;; (println "\n\n" product-query-sql)

(defn clean-product-plus [m]
  (cond-> m
