Added status filtering