Fine tuning

Pre-selection of `option` entities and clean-up :+1: