added support for customized location based queries