WP-2657: adjust spacing when topic is not present.