Fix #1145717
Remove duplicate code and fix for creating one content
Fix for common variables