diff --git a/include/components/controller.hpp b/include/components/controller.hpp
index f5593a96..79bb96c4 100644
--- a/include/components/controller.hpp
+++ b/include/components/controller.hpp
@@ -75,7 +75,7 @@ class controller
  private:
   size_t setup_modules(alignment align);
 
-  bool try_forward_legacy_action(const string cmd);
+  bool try_forward_legacy_action(const string& cmd);
 
   connection& m_connection;
   signal_emitter& m_sig;
diff --git a/include/modules/alsa.hpp b/include/modules/alsa.hpp
index da97c7bb..21903382 100644
--- a/include/modules/alsa.hpp
+++ b/include/modules/alsa.hpp
@@ -36,7 +36,7 @@ namespace modules {
     static constexpr auto EVENT_TOGGLE = "toggle";
 
    protected:
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     static constexpr auto FORMAT_VOLUME = "format-volume";
diff --git a/include/modules/backlight.hpp b/include/modules/backlight.hpp
index 4bec7501..779821ba 100644
--- a/include/modules/backlight.hpp
+++ b/include/modules/backlight.hpp
@@ -32,7 +32,7 @@ namespace modules {
     static constexpr const char* EVENT_DEC = "dec";
 
    protected:
-    bool input(string&& cmd, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     static constexpr auto TAG_LABEL = "<label>";
diff --git a/include/modules/bspwm.hpp b/include/modules/bspwm.hpp
index 9b02104e..7bf1a469 100644
--- a/include/modules/bspwm.hpp
+++ b/include/modules/bspwm.hpp
@@ -54,7 +54,7 @@ namespace modules {
     static constexpr auto EVENT_PREV = "prev";
 
    protected:
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     bool handle_status(string& data);
diff --git a/include/modules/date.hpp b/include/modules/date.hpp
index 292086f5..4899f37b 100644
--- a/include/modules/date.hpp
+++ b/include/modules/date.hpp
@@ -21,7 +21,7 @@ namespace modules {
     static constexpr auto EVENT_TOGGLE = "toggle";
 
    protected:
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     static constexpr auto TAG_LABEL = "<label>";
diff --git a/include/modules/i3.hpp b/include/modules/i3.hpp
index a3408580..6cd604c1 100644
--- a/include/modules/i3.hpp
+++ b/include/modules/i3.hpp
@@ -58,7 +58,7 @@ namespace modules {
     static constexpr auto EVENT_PREV = "prev";
 
    protected:
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     static string make_workspace_command(const string& workspace);
diff --git a/include/modules/menu.hpp b/include/modules/menu.hpp
index cda13c27..e07df7a2 100644
--- a/include/modules/menu.hpp
+++ b/include/modules/menu.hpp
@@ -29,7 +29,7 @@ namespace modules {
     static constexpr auto EVENT_EXEC = "exec";
 
    protected:
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     static constexpr auto TAG_LABEL_TOGGLE = "<label-toggle>";
diff --git a/include/modules/meta/base.hpp b/include/modules/meta/base.hpp
index 3acd7804..acab76ac 100644
--- a/include/modules/meta/base.hpp
+++ b/include/modules/meta/base.hpp
@@ -137,7 +137,7 @@ namespace modules {
     void teardown();
     string contents();
 
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
     string input_handler_name() const;
 
     static constexpr auto TYPE = "";
diff --git a/include/modules/meta/base.inl b/include/modules/meta/base.inl
index d955e68d..f1827934 100644
--- a/include/modules/meta/base.inl
+++ b/include/modules/meta/base.inl
@@ -104,7 +104,7 @@ namespace modules {
   }
 
   template <typename Impl>
-  bool module<Impl>::input(string&&, string&&) {
+  bool module<Impl>::input(const string&, const string&) {
     // By default a module doesn't support inputs
     return false;
   }
diff --git a/include/modules/meta/input_handler.hpp b/include/modules/meta/input_handler.hpp
index da9142f3..60a5c202 100644
--- a/include/modules/meta/input_handler.hpp
+++ b/include/modules/meta/input_handler.hpp
@@ -16,7 +16,7 @@ namespace modules {
      *
      * \returns true if the action is supported and false otherwise
      */
-    virtual bool input(string&& action, string&& data) = 0;
+    virtual bool input(const string& action, const string& data) = 0;
 
     /**
      * The name of this input handler
diff --git a/include/modules/mpd.hpp b/include/modules/mpd.hpp
index d9a59846..07510ac5 100644
--- a/include/modules/mpd.hpp
+++ b/include/modules/mpd.hpp
@@ -38,7 +38,7 @@ namespace modules {
     static constexpr const char* EVENT_SEEK = "seek";
 
    protected:
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     static constexpr const char* FORMAT_ONLINE{"format-online"};
diff --git a/include/modules/pulseaudio.hpp b/include/modules/pulseaudio.hpp
index 801a4b3d..78a72517 100644
--- a/include/modules/pulseaudio.hpp
+++ b/include/modules/pulseaudio.hpp
@@ -29,7 +29,7 @@ namespace modules {
     static constexpr auto EVENT_TOGGLE = "toggle";
 
    protected:
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     static constexpr auto FORMAT_VOLUME = "format-volume";
diff --git a/include/modules/systray.hpp b/include/modules/systray.hpp
index 54cbd850..d59a4c64 100644
--- a/include/modules/systray.hpp
+++ b/include/modules/systray.hpp
@@ -24,7 +24,7 @@ namespace modules {
     static constexpr auto EVENT_TOGGLE = "toggle";
 
    protected:
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
 
diff --git a/include/modules/unsupported.hpp b/include/modules/unsupported.hpp
index 2009b3d4..1388e456 100644
--- a/include/modules/unsupported.hpp
+++ b/include/modules/unsupported.hpp
@@ -36,7 +36,7 @@ namespace modules {
     string input_handler_name() const {                                                 \
       return "";                                                                        \
     }                                                                                   \
-    bool input(string&&, string&&) {                                                    \
+    bool input(const string&, const string&) {                                          \
       return false;                                                                     \
     }                                                                                   \
   }
diff --git a/include/modules/xbacklight.hpp b/include/modules/xbacklight.hpp
index 6e299994..6fedbf92 100644
--- a/include/modules/xbacklight.hpp
+++ b/include/modules/xbacklight.hpp
@@ -37,7 +37,7 @@ namespace modules {
 
    protected:
     void handle(const evt::randr_notify& evt);
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     static constexpr const char* TAG_LABEL{"<label>"};
diff --git a/include/modules/xkeyboard.hpp b/include/modules/xkeyboard.hpp
index a5a7dfd1..98da1eeb 100644
--- a/include/modules/xkeyboard.hpp
+++ b/include/modules/xkeyboard.hpp
@@ -38,7 +38,7 @@ namespace modules {
     void handle(const evt::xkb_state_notify& evt);
     void handle(const evt::xkb_indicator_state_notify& evt);
 
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     static constexpr const char* TAG_LABEL_LAYOUT{"<label-layout>"};
diff --git a/include/modules/xworkspaces.hpp b/include/modules/xworkspaces.hpp
index daa21c6a..62aafd90 100644
--- a/include/modules/xworkspaces.hpp
+++ b/include/modules/xworkspaces.hpp
@@ -72,7 +72,7 @@ namespace modules {
     void rebuild_desktop_states();
     void set_desktop_urgent(xcb_window_t window);
 
-    bool input(string&& action, string&& data);
+    bool input(const string& action, const string& data);
 
    private:
     static vector<string> get_desktop_names();
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index a0cc7404..e3c250ad 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -397,7 +397,7 @@ void controller::process_eventqueue() {
  * \returns true iff the given command matches a legacy action string and was
  *          successfully forwarded to a module
  */
-bool controller::try_forward_legacy_action(const string cmd) {
+bool controller::try_forward_legacy_action(const string& cmd) {
   /*
    * Maps legacy action names to a module type and the new action name in that module.
    *
@@ -412,7 +412,7 @@ bool controller::try_forward_legacy_action(const string cmd) {
 // clang-format off
 #define A_MAP(old, module_name, event) {old, {string(module_name::TYPE), string(module_name::event)}}
 
-  const std::map<string, std::pair<string, const string>> legacy_actions{
+  static const std::map<string, std::pair<string, const string>> legacy_actions{
     A_MAP("datetoggle", date_module, EVENT_TOGGLE),
 #if ENABLE_ALSA
     A_MAP("volup", alsa_module, EVENT_INC),
@@ -487,7 +487,7 @@ bool controller::try_forward_legacy_action(const string cmd) {
           }
           m_log.info(
               "Forwarding legacy action '%s' to module '%s' as '%s' with data '%s'", cmd, handler_name, action, data);
-          if (!handler_ptr->input(std::forward<string>(action), std::forward<string>(data))) {
+          if (!handler_ptr->input(action, data)) {
             m_log.err("Failed to forward deprecated action to %s module", type);
             // Forward to shell if the module cannot accept the action to not break existing behavior.
             return false;
@@ -514,8 +514,8 @@ void controller::process_inputdata() {
     return;
   }
 
-  const string cmd = m_inputdata;
-  m_inputdata.clear();
+  const string cmd = std::move(m_inputdata);
+  m_inputdata = string{};
 
   m_log.trace("controller: Processing inputdata: %s", cmd);
 
@@ -543,7 +543,7 @@ void controller::process_inputdata() {
     // Forwards the action to all input handlers that match the name
     for (auto&& handler : m_inputhandlers) {
       if (handler->input_handler_name() == handler_name) {
-        if (!handler->input(std::forward<string>(action), std::forward<string>(data))) {
+        if (!handler->input(action, data)) {
           m_log.err("The '%s' module does not support the '%s' action.", handler_name, action);
         }
 
diff --git a/src/modules/alsa.cpp b/src/modules/alsa.cpp
index 5d0df3a9..c817b2d0 100644
--- a/src/modules/alsa.cpp
+++ b/src/modules/alsa.cpp
@@ -218,7 +218,7 @@ namespace modules {
     return true;
   }
 
-  bool alsa_module::input(string&& action , string&&) {
+  bool alsa_module::input(const string& action, const string&) {
     if (!m_handle_events) {
       return false;
     } else if (!m_mixer[mixer::MASTER]) {
diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp
index ed058ddb..8bdae4b6 100644
--- a/src/modules/backlight.cpp
+++ b/src/modules/backlight.cpp
@@ -113,12 +113,12 @@ namespace modules {
     return true;
   }
 
-  bool backlight_module::input(string&& cmd, string&&) {
+  bool backlight_module::input(const string& action, const string&) {
     double value_mod{0.0};
 
-    if (cmd == EVENT_INC) {
+    if (action == EVENT_INC) {
       value_mod = 5.0;
-    } else if (cmd == EVENT_DEC) {
+    } else if (action == EVENT_DEC) {
       value_mod = -5.0;
     } else {
       return false;
diff --git a/src/modules/bspwm.cpp b/src/modules/bspwm.cpp
index 017f786c..4e85eb6f 100644
--- a/src/modules/bspwm.cpp
+++ b/src/modules/bspwm.cpp
@@ -445,7 +445,7 @@ namespace modules {
     return false;
   }
 
-  bool bspwm_module::input(string&& action, string&& data) {
+  bool bspwm_module::input(const string& action, const string& data) {
     auto send_command = [this](string payload_cmd, string log_info) {
       try {
         auto ipc = bspwm_util::make_connection();
diff --git a/src/modules/date.cpp b/src/modules/date.cpp
index 11fcb6bf..127e7832 100644
--- a/src/modules/date.cpp
+++ b/src/modules/date.cpp
@@ -83,7 +83,7 @@ namespace modules {
     return true;
   }
 
-  bool date_module::input(string&& action, string&&) {
+  bool date_module::input(const string& action, const string&) {
     if (action != EVENT_TOGGLE) {
       return false;
     }
diff --git a/src/modules/i3.cpp b/src/modules/i3.cpp
index 5e316f05..f7d970c6 100644
--- a/src/modules/i3.cpp
+++ b/src/modules/i3.cpp
@@ -218,7 +218,7 @@ namespace modules {
     return true;
   }
 
-  bool i3_module::input(string&& action, string&& data) {
+  bool i3_module::input(const string& action, const string& data) {
     try {
       const i3_util::connection_t conn{};
 
diff --git a/src/modules/menu.cpp b/src/modules/menu.cpp
index 21c5d893..dbf9adea 100644
--- a/src/modules/menu.cpp
+++ b/src/modules/menu.cpp
@@ -99,7 +99,7 @@ namespace modules {
     return true;
   }
 
-  bool menu_module::input(string&& action, string&& data) {
+  bool menu_module::input(const string& action, const string& data) {
     if (action == EVENT_EXEC) {
       auto sep = data.find("-");
 
diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp
index 99572a09..5e79aa0c 100644
--- a/src/modules/mpd.cpp
+++ b/src/modules/mpd.cpp
@@ -353,7 +353,7 @@ namespace modules {
     return true;
   }
 
-  bool mpd_module::input(string&& action, string&& data) {
+  bool mpd_module::input(const string& action, const string& data) {
     m_log.info("%s: event: %s", name(), action);
 
     try {
diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp
index c1d1b5a6..e99ca049 100644
--- a/src/modules/pulseaudio.cpp
+++ b/src/modules/pulseaudio.cpp
@@ -142,7 +142,7 @@ namespace modules {
     return true;
   }
 
-  bool pulseaudio_module::input(string&& action, string&&) {
+  bool pulseaudio_module::input(const string& action, const string&) {
     if (!m_handle_events) {
       return false;
     }
diff --git a/src/modules/systray.cpp b/src/modules/systray.cpp
index 41371d7f..f102d61c 100644
--- a/src/modules/systray.cpp
+++ b/src/modules/systray.cpp
@@ -53,7 +53,7 @@ namespace modules {
   /**
    * Handle input event
    */
-  bool systray_module::input(string&& action, string&&) {
+  bool systray_module::input(const string& action, const string&) {
     if (action.find(EVENT_TOGGLE) != 0) {
       return false;
     }
diff --git a/src/modules/xbacklight.cpp b/src/modules/xbacklight.cpp
index 3297b850..901694c9 100644
--- a/src/modules/xbacklight.cpp
+++ b/src/modules/xbacklight.cpp
@@ -147,7 +147,7 @@ namespace modules {
   /**
    * Process scroll events by changing backlight value
    */
-  bool xbacklight_module::input(string&& action, string&&) {
+  bool xbacklight_module::input(const string& action, const string&) {
     double value_mod{0.0};
 
     if (action == EVENT_INC) {
diff --git a/src/modules/xkeyboard.cpp b/src/modules/xkeyboard.cpp
index 39403ad1..cdceccb7 100644
--- a/src/modules/xkeyboard.cpp
+++ b/src/modules/xkeyboard.cpp
@@ -207,7 +207,7 @@ namespace modules {
   /**
    * Handle input command
    */
-  bool xkeyboard_module::input(string&& action, string&&) {
+  bool xkeyboard_module::input(const string& action, const string&) {
     if (action != EVENT_SWITCH) {
       return false;
     }
diff --git a/src/modules/xworkspaces.cpp b/src/modules/xworkspaces.cpp
index edf53e24..128524fd 100644
--- a/src/modules/xworkspaces.cpp
+++ b/src/modules/xworkspaces.cpp
@@ -368,7 +368,7 @@ namespace modules {
   /**
    * Handle user input event
    */
-  bool xworkspaces_module::input(string&& action, string&& data) {
+  bool xworkspaces_module::input(const string& action, const string& data) {
     std::lock_guard<std::mutex> lock(m_workspace_mutex);
 
     vector<unsigned int> indexes;