#3491 improved menulink handling