Changed a couple of generators to use query syntax