removed hardcoded JSON
updated dataservice to be a bit more robust
added "all measures" tab to measure selection