moved query-gateway back to original location