Fix query riserve