Fix filter andor bug + stop disabling apply button