Fixed problem with empty search strings