Better handle "Unresolved" and "Not assigned" selections

Missed files