Served & Viewed js fixes