MOB-213 html clean up after close and separate jst implemented
MOB-213 test fixed