Include more advanced search options: group, category, valid etc