Added attributes to search, updated form to take attributes