Improve html markup location.
Merge branch '5821-amitai' of github.com:openscholar/openscholar into 5821-amitai