Fix links. (Dan)
Make 'filter by' work with service types, not names.