Revert "fix filter more"

This reverts commit f9db963ae0301fde129ccb8c47d8eea198d1e454.
Revert "Filter fix"

This reverts commit 2f0809c30f837487128fac959a166bc878adca80.
REVERTING BECAUSE UI BUGGED OUT