Added additional fields for search form