The natural query field mixin is now added to each field.
Ensured that both field and model can be mixined.