Show functions fixes