Refactor/product query builder registry

Make sense