Bugfix on more/less button refs #18877