Update query to handle both qb:dataSet and qb:dataset (...)
Add an observation factory to delegate the observation building process