Improvements for formulae language and selectors