Smal bug fix and working on filters again