fix some charts. get rid of where clause