Extend supported use cases for Select and Then extensions