Refactor/product query builder registry

simply register?