Moved product catalog service and query service