diff --git a/doc/FIXME.md b/doc/FIXME.md
index 7847807..3edf419 100644
--- a/doc/FIXME.md
+++ b/doc/FIXME.md
@@ -24,8 +24,9 @@ FIXMEs/BUGs
     node_modules/cpu-features/lib/index.js:3:24:
       3 │ const binding = require('../build/Release/cpufeatures.node');
         ╵                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- [] SSH shutdown command does not give hand back immediately
+- [ ] SSH shutdown command does not give hand back immediately
   => force or do not wait for promise resolution? 'exit' does not seem to work
+- [ ] Refactor to use deviceId validator in every service which needs it
 
 ## WEB
 
diff --git a/doc/TODO.md b/doc/TODO.md
index 8a436cc..a769e80 100644
--- a/doc/TODO.md
+++ b/doc/TODO.md
@@ -91,7 +91,14 @@ TODOs
       - [ ] Add schedule
       - [ ] Remove schedule by id
       - [ ] List all schedules
-      - [ ] Display schedule by id
+        - [X] Basic info
+        - [ ] Next job execution time (absolute)
+      - [ ] Display schedules by device id
+        - [X] Basic info
+        - [ ] Same details as all schedules
+      - [ ] Display schedules by sch id
+        - [ ] Basic info
+        - [ ] Same details as all schedules
     - ON/OFF service
       - From schedule
         - [X] ID list as parameter for ON and OFF