bugfix in dataset model and adding org resource