solved some bug, added filters