Will and Steve - changes to FieldSearch