Fix order topics