Added analysis controller
Dataset service now filtering on type
Fixed merge conflict