diff --git a/.config/shell/git b/.config/shell/git
index 80885ff..969b3ab 100644
--- a/.config/shell/git
+++ b/.config/shell/git
@@ -115,7 +115,7 @@ gitremote() {
   git:*)  echo "$1" ;;
   *)  test "$3" = "cau" && 3="CAU-Kiel-Tech-Inf"
     test "$3" = "btl" && 3="betweenthelinesev"
-    echo "git@git${1:-hub}.com:${3:-xerus2000}/${2:-$(basename $PWD)}.git" ;;
+    echo "git@${1:-github}.com:${3:-xerus2000}/${2:-$(basename $PWD)}.git" ;;
   esac
 }
 
@@ -129,7 +129,7 @@ gitclone() {
 gitfork() {
   builtin cd "$projects_dir/_forks"
   gitclone hub "$1" "" "$3" --recurse-submodules
-  test "$2" && git remote add upstream "$(gitremote hub "$1" "$2")"
+  test "$2" && git remote add upstream "$(gitremote github "$1" "$2")"
   git remote -v
 }
 
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index caadb9b..95f75e1 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -42,6 +42,7 @@ plugins=(
 	fast-syntax-highlighting
 	zsh-autosuggestions
 	zsh-vim-mode
+	history-substring-search
 )
 
 _comp_options+=(globdots) # Show files starting with dot in autocomplete