[#303] Tweaks to group and org templates for search