#291 resolved, added query collection specification.