post-merge fixes for admin_feedback_browse.php