Implement a smarter search
Fix default settings