Adding support for tag pages