Merge pull request #1380 from laerreal/fix_remarks_hiding