Two commits are model bug fixes, and the final one uses them to add a placeholder message for empty pop-up views.
The first commit might be cherry-pickable; the final two are probably too risky.