[Bug #8152] Fixed IE and Safari issues