added support for empty values to cockpit