Added query.q back, Fixes #110