HSEARCH-763 Adding validation of query fields