Tweaked filtering UI even more