--HR-359 fix for view page