Resolve issues with watchPosition

Jira: HUBWV-30, HUBWV-31