Fixed searching with spaces