HYDRASIR-317 Profile field adjustments and UI implementation

Code tweak to use more succinct condition clause.