Fixed inline fields
properly map events