Fixed an issue with infinite loading + filters