Working on advanced search UI