refactor thematic coverage computation