add query params to id fields