html code cleanup. add one more guard on server