Fixes annotation feature

* Also adds a check for tasks in overlay to api