Corrected watch for indicatorId

Merge gone wrong - the indicatorId attribute is now observed. Fixed some checks and improved the index.html as well.