Field and FieldSearch update, add integration test