Fix tags in list + advanced search code base