Start of annotated queries - test passes although probably fragile
depending on which order fields get read in (works for me for now)