More work on BZ#1030099 - Reduce noise with small topics.
Added an additional fix for BZ#1056655