some corrections (removing None filter when it doesn't make sense)