case 2743 - Refactor periodicals according to latest changes.
Merge branch 'case-2743' into new-search