CMS-3639 Remove dependency of path on region and page component elements
Minor refactoring