Minor clean up.
Limit staus query to one item.