Case 3748 - Fixed show more/less buttons.
Merge remote branch 'origin/case-3748' into new-search