fixed topics and admin views, broken after merge