Fix empty strings triggering as values