DEVSUPPORT-1296: Adds new advanced search to circumvent returning all results
Merge branch 'devsupport-1296'
DEVSUPPORT-1296 Fix automated tests