Fixed a couple of bugs in analysis pages