Clarify annotator selection code, and fix selections occuring in non full message views