Remove unnecessary query id