fix issues for filter and dynamic x-axis
Merge pull request #31 from erikevans719/master

fix issues for filter and dynamic x-axis