Refactor/product query builder registry

good catch ! I add them, thank you !