Changes for empty query search implemented