Improved simple search accuracy, implemented advanced search