Search is working, need polishing