UAT Bug Fix

Comments saving