Refactors unescape mechanism for selectors, values are now unescaped
before the simple selector initialization