LPS-32153 Fix bug with folders and file entries in hidden folders
LPS-32153 Put constants together, then free form "text"