Added checks to ensure search strings specified so no errors in API