Advanced Search, some bugs are fixed