More consistent markup for filter values.