Make search a little smarter