post-merge fixes for feedbackfunctions.php