post-merge fixes for admin_template_feedback.php