Upgrading searching and templates