Bug fixing, basic filters now working