diff --git a/common/content/mappings.js b/common/content/mappings.js
index 07890c67..4b0d53e6 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -82,7 +82,7 @@ Map.prototype = {
      * @param {string} name The name to query.
      * @returns {boolean}
      */
-    hasName: function (name) this.names.indexOf(name) >= 0 || this.names.indexOf(name.replace(/<S-(.)>/g, "$1")) >= 0,
+    hasName: function (name) this.names.indexOf(name) >= 0,
 
     /**
      * Execute the action for this mapping.
@@ -211,7 +211,7 @@ function Mappings() //{{{
                 {
                     mappings.addUserMap([m], [lhs],
                             "User defined mapping",
-                            function (count) { events.feedkeys((count > 1 ? count : "") + this.rhs, this.noremap, this.silent); },
+                            function (count) { events.feedkeys((count > -1 ? count : "") + this.rhs, this.noremap, this.silent); },
                             {
                                 flags: Mappings.flags.COUNT,
                                 rhs: events.canonicalKeys(rhs),