Resolved searching issue with spaces