FLOE-195: Replaced manual model binding with new indicators  with the binding on existing renderer model fields.