Partial fix for wrong id.
Fixes #68.
Fixes regression due to `displayMapDisplay` and `todoIdStorage` not updating.
Source clean up.
Removed unneeded references. [skip ci]
Merge branch 'Issue68'