Further improved avatar object selection logic.