Fixed filtering functionality, minor active bug.