fix issues for filter and dynamic x-axis