Fixing offset issues when applying filters and UI Changes.