fix 18n feedback usage
CR Fixes