You should make this resilient to getting `null` back for the query; I think we'll temporarily need two queries for polymer and non-polymer versions.