Fix: use right attribute for datasource id