added status filtering