Fixed Charts

add charts
fix queries