Modified "Between" context set to include other options