Changed the query for #136.