Hack to fix the filter button toggle issue, it works partially, it must be improved