diff --git a/InitUiElements.ts b/InitUiElements.ts
index 5ebe3a3..5af961d 100644
--- a/InitUiElements.ts
+++ b/InitUiElements.ts
@@ -35,6 +35,7 @@ import ScrollableFullScreen from "./UI/Base/ScrollableFullScreen";
 import Translations from "./UI/i18n/Translations";
 import MapControlButton from "./UI/MapControlButton";
 import Combine from "./UI/Base/Combine";
+import SelectedFeatureHandler from "./Logic/Actors/SelectedFeatureHandler";
 
 export class InitUiElements {
 
@@ -257,7 +258,8 @@ export class InitUiElements {
             }
         })
         isOpened.setData(true)
-
+        
+ 
     }
 
     private static InitLayerSelection() {
@@ -387,7 +389,7 @@ export class InitUiElements {
         new ShowDataLayer(source.features, State.state.leafletMap,
             State.state.layoutToUse);
 
-        // TOO reenable  new SelectedFeatureHandler(Hash.hash, State.state.selectedElement, source);
+        new SelectedFeatureHandler(Hash.hash, State.state.selectedElement, source);
 
 
     }
diff --git a/Logic/Actors/ImageSearcher.ts b/Logic/Actors/ImageSearcher.ts
index 6562b7e..0966287 100644
--- a/Logic/Actors/ImageSearcher.ts
+++ b/Logic/Actors/ImageSearcher.ts
@@ -52,14 +52,12 @@ export class ImageSearcher extends UIEventSource<{ key: string, url: string }[]>
 
         // By wrapping this in a UIEventSource, we prevent multiple queries of loadWikiData
         this._wdItem.addCallback(wdItemContents => {
-            // TODO HANDLE IMAGES
             const images = ImageSearcher.loadWikidata(wdItemContents).map(url => {
                 return {url: url, key: undefined}
             });
             AddImages(images);
         });
         this._commons.addCallback(commonsData => {
-            // TODO Handle images
             const images = ImageSearcher.LoadCommons(commonsData).map(url => {
                 return {url: url, key: undefined}
             });
diff --git a/UI/Base/SubtleButton.ts b/UI/Base/SubtleButton.ts
index b89f6bf..ba76527 100644
--- a/UI/Base/SubtleButton.ts
+++ b/UI/Base/SubtleButton.ts
@@ -49,7 +49,6 @@ export class SubtleButton extends UIElement{
             ]).Render();
         }
 
-        // Styling todo
         return new Combine([
             this.image,
             this.message,
diff --git a/UI/Input/ValidatedTextField.ts b/UI/Input/ValidatedTextField.ts
index 82b2f39..4f9be38 100644
--- a/UI/Input/ValidatedTextField.ts
+++ b/UI/Input/ValidatedTextField.ts
@@ -165,7 +165,7 @@ export default class ValidatedTextField {
         ValidatedTextField.tp(
             "opening_hours",
             "Has extra elements to easily input when a POI is opened",
-            (s, country) => true, // TODO
+            (s, country) => true, 
             str => str, 
             (value) => {
                 return new OpeningHoursInput(value);