Search fields can be overridden again. Fixes #709
Merge branch 'search/search-fields-overriding' into search/prevent-abstract-models-from-being-indexed