3.0.16 - Retain and use optional selections