Fixed bugs in new show functions