fixed filtering on None values