Fixed hard-coded dependency on page id or page wrapper.