further fixes for firefox

It turns out that unescaped '-' ends up making firefox sad. This fixes
it so the dashboards work again correctly in firefox.

This... also... was apparently what was killing Chrome. zomg.

Change-Id: I42dbc9354f2978f18fd8fa8ff4cc07f52f6557e1
Merge "further fixes for firefox"