Refactor/product query builder registry

Yes !! I need to merge master first ;)