Fix problems with hits
Merge branch 'axxim/factoids'