updated search form to include street address and country