Improved the advanced search form