more post-merge fixing

- adjustments for alix5-feature-feedback.sql
- adjustments for feedback.php