fixing the issues on live web-sites