Added checking on search for empty string or white space  Ticket: GCP-8996  Reviewer: To be reviewed by Jai