adding support for multiple data sources per view
included q-values as an alternative source for the view
cleanup