Be more selective about updating Run status