Filter feature now working as it should!