Topic/js fixes