Fix empty pillar value issues