Empty topics list fix