fixes #1467 context menu comments
fixed wrong behavior + polish label