NH-2611 - Support for a user defined query provider