Improve behaviour of the AJAX.
Merge branch 'SCHOLAR-3.x' into 5817-fixes
Merge pull request #5936 from openscholar/5817-fixes

Improve behavior of the AJAX.