#SH-7080 Update feedback and entry routes