Updated some search mappings.
Removed auto-centre.
Merge branch 'master' into mac