Fixed sorting & filtering issues.