Make span selectors not as crazy

Auditors: alpert