fix for BUGHUNTS4WEBBASEDARENA-33, BUGHUNTS4WEBBASEDARENA-24 and BUGHUNT...

fix for BUGHUNTS4WEBBASEDARENA-33, 24, 31, and 23