- Improve search with spaces