Improvements to formulae language and selectors