Fixed escaped values when returning to #fields page