Add peter's settings changes
delete extraneous query_fields
capitalise object names