Add shortcut and Change router to case insensitive