Refactor to use jquery selectors to find esi-ish tags