Make hasStatus filter test more accurate
Some changes on status mapping and corresponding filters