bug fixes in the public viewing