Tweak output of demo handler