Added some more cases to search utility