Fixed search toggles and overrides