Improvements to #78731

Solved problem related to feature fields not appearing in the popup sometimes.