Fix topic preview bug, small changes