Fixup some bugs

Add more filtering