got the filtering right, now trying to not break the sorting + filtering combined