Fixing client-side components to support empty values