don't attempt to filter on field when fieldname = model name (e.g. file.file)
properly handle non-required fields