Fixed: Removed Mode from field selection