Couple fixes for  /graphData view
Added final batch of mappings to make a complete set