fixes edge case scenario for zero hits
Merge branch 'amenadiel-apcu_tabs' into apcu