CH-50 - Ensure tags are ordered on all pages