changed sort to form fields; added place and address search