Added support for another kind of measurement metadata; Added references for data; Fix bug with Other category not showing all data