add two charts and tooltip changes
Merge pull request #2 from sb2nov/sb/reformatFilterFunc

add two charts and tooltip changes