Revert changes made for D3 graphs, will get to that later. Continuing with taggable work now