Fixed buggy filtering and animations