Fixes for 22_Top_hits

Closes #175