Added beginnings of advanced search