VID-87 re-added html output