Improve search engine and make it case insensitive