--HR-359 change for edit screen