Update to documentation and return values in selectors