fix feedback for new schema