Refactor/product query builder registry