Working on the advanced search fields