more deletions
fixed total query and chart