Expand builtin shortcuts when needed

Author: VictoriousRaptor

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -841,15 +841,20 @@ private Query ConstructQuery(string queryText, IEnumerable<CustomShortcutModel>
                 queryBuilder.Replace('@' + shortcut.Key, shortcut.Expand());
             }
 
+            string customExpanded = queryBuilder.ToString();
+
             Application.Current.Dispatcher.Invoke(() =>
             {
                 foreach (var shortcut in builtInShortcuts)
                 {
                     try
                     {
-                        var expansion = shortcut.Expand();
-                        queryBuilder.Replace(shortcut.Key, expansion);
-                        queryBuilderTmp.Replace(shortcut.Key, expansion);
+                        if (customExpanded.Contains(shortcut.Key))
+                        {
+                            var expansion = shortcut.Expand();
+                            queryBuilder.Replace(shortcut.Key, expansion);
+                            queryBuilderTmp.Replace(shortcut.Key, expansion);
+                        }
                     }
                     catch (Exception e)
                     {