Fix cols for graph
Make graph gracefully handle case where no data is returned