Fixed: Some not yet implemented locations go to the help menu.

Fixed: Some not yet implemented locations go to the help menu.