fixing toggleShowMore
Merging origin/dval/master-pending-fix-toggle-show-more into master