some issues
Merge pull request #3250 from dotCMS/missing-3136

some issues after testing