Move original identifier pulling from options outside of dummy header block