Improved focus model handling of selection model