Subscribe to marker changes

This actually subscribes to marker changes. 

Fixes #2705