PIM-1899 : fix flexible date filter (between) by using the same flexible
query builder in repository to ensure the alias increment