Added tooltips and improved data points sql queries