working on fix for datastore directive & unexpected scope changes