diff --git a/sources/Component/Tag/TagComponent.hpp b/sources/Component/Tag/TagComponent.hpp
index 5bcd837f..1c1f9883 100644
--- a/sources/Component/Tag/TagComponent.hpp
+++ b/sources/Component/Tag/TagComponent.hpp
@@ -62,4 +62,6 @@ namespace BBM
 	// interact with bombs (getting damage etc) but doesn't stop explosion
 	constexpr const char BlowablePass[] = "BlowablePass";
 	constexpr const char Timer[] = "Timer";
+	constexpr const char RestartTimer[] = "RestartTimer";
+	constexpr const char ResumeButton[] = "ResumeButton";
 }
diff --git a/sources/Runner/PauseMenuScene.cpp b/sources/Runner/PauseMenuScene.cpp
index 6509b3f9..2999e5bb 100644
--- a/sources/Runner/PauseMenuScene.cpp
+++ b/sources/Runner/PauseMenuScene.cpp
@@ -59,7 +59,7 @@ namespace BBM
 			{
 				auto &gameScene = gameState.loadedScenes[BBM::GameState::SceneID::GameScene];
 
-				for (WAL::Entity &entity : gameScene->view<TagComponent<"RestartTimer">>())
+				for (WAL::Entity &entity : gameScene->view<TagComponent<RestartTimer>>())
 					entity.scheduleDeletion();
 
 				for (auto &[entity, controller, _] : gameScene->view<ControllableComponent, HealthComponent>()) {
@@ -81,7 +81,7 @@ namespace BBM
 					})
 					.addComponent<PositionComponent>(1920 / 2 - 2 * 30, 1080 / 2, 0)
 					.addComponent<TagComponent<Timer>>()
-					.addComponent<TagComponent<"RestartTimer">>()
+					.addComponent<TagComponent<RestartTimer>>()
 					.addComponent<Drawable2DComponent, RAY2D::Text>("", 60, RAY::Vector2(), ORANGE);
 				gameState.nextScene = BBM::GameState::SceneID::GameScene;
 			});
diff --git a/sources/Runner/ResumeLobbyScene.cpp b/sources/Runner/ResumeLobbyScene.cpp
index bc92fa47..8387d35b 100644
--- a/sources/Runner/ResumeLobbyScene.cpp
+++ b/sources/Runner/ResumeLobbyScene.cpp
@@ -65,7 +65,7 @@ namespace BBM
 						return;
 					ResumeLobbySystem::resumeToGame(wal);
 				})
-				.addComponent<TagComponent<"ResumeButton">>();
+				.addComponent<TagComponent<ResumeButton>>();
 		auto &back = scene->addEntity("back to menu")
 				.addComponent<PositionComponent>(10, 1080 - 85, 0)
 				.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_back.png")
diff --git a/sources/System/Lobby/ResumeLobbySystem.cpp b/sources/System/Lobby/ResumeLobbySystem.cpp
index 5d57a25d..9116b7a9 100644
--- a/sources/System/Lobby/ResumeLobbySystem.cpp
+++ b/sources/System/Lobby/ResumeLobbySystem.cpp
@@ -9,20 +9,12 @@
 #include "Component/Speed/SpeedComponent.hpp"
 #include "System/MenuControllable/MenuControllableSystem.hpp"
 #include "Component/Tag/TagComponent.hpp"
-#include <algorithm>
 #include <Runner/Runner.hpp>
-#include <Component/Keyboard/KeyboardComponent.hpp>
-#include <Component/Gamepad/GamepadComponent.hpp>
-#include "Component/IAControllable/IAControllableComponent.hpp"
 #include <Component/Position/PositionComponent.hpp>
 #include <Component/Renderer/Drawable3DComponent.hpp>
-#include <Map/Map.hpp>
 #include <Component/BombHolder/BombHolderComponent.hpp>
 #include <Parser/ParserYaml.hpp>
-#include <Drawables/2D/Text.hpp>
 #include "Component/Color/ColorComponent.hpp"
-#include "Component/Stat/StatComponent.hpp"
-#include "Component/Bonus/PlayerBonusComponent.hpp"
 #include "System/Lobby/LobbySystem.hpp"
 
 namespace RAY3D = RAY::Drawables::Drawables3D;
@@ -66,7 +58,7 @@ namespace BBM
 
 	void ResumeLobbySystem::onSelfUpdate(std::chrono::nanoseconds dtime)
 	{
-		auto &view = this->_wal.getScene()->view<TagComponent<"ResumeButton">, Drawable2DComponent>();
+		auto &view = this->_wal.getScene()->view<TagComponent<ResumeButton>, Drawable2DComponent>();
 		if (view.size() == 0)
 			return;
 		auto *texture = dynamic_cast<RAY::Texture *>(view.front().get<Drawable2DComponent>().drawable.get());