QueryConstruct: catch singleton bugs

See uwescience/raco#352