Fixed dashboard import, broken by dashboard loading redesign #609
Annotation datasource redesign is done, Closes #608