[jan] Fix highlighting of menu entries.
Fix scope (Bug #12345).
Fix variable.
BFN