Resolve issues with watchPosition

Jira: HUBWV-30, HUBWV-31
Merge pull request #9 from cbotsikas/HUBWV-31

Resolve issues with watchPosition