Fix #1207 Remarks toggle behavior improved