Refactor/product query builder registry

maybe it'll be a second step ?