Case 3460 - Fixed issue with wrong periodical titles.
Case 3460 - Code improvements and code style fixes.
Merge branch 'case-3460' into new-search

* case-3460:
  Case 3460 - Code improvements and code style fixes.
  Case 3460 - Fixed issue with wrong periodical titles.