add query id back in