Search: Search fields can be overridden again. Fixes #709