little fixes, more filtering