Fix socket rooms to display lots of data for graph
Fix merge conflict