Add the rest of the search fields