More documentation search and templates fixing