Add Status filtering