Some more changes to object selection