Make NavigateCommandFor compatible with keyboard shortcuts
Fix up sample