Roxie query changes