[FIX] models: simplify conditions that seem to lead to missing fields