Fix bug with currentFilter