fixed some bugs, added filter