Clean up the code
Fix #109 Quick Search is not working