case 4137 - Minor fixes.
Merge branch 'case-4137' into opac