improve window navigation mappings
move cmdline-ranges improvement to plugin