add filtration for NoneType locations