Changed service id to always match docid