Modified the viewers to use the 'auto-select URI' code, rather than just <p> tags