Fixed event bug and started radio selection