COUNT mappings properly

.with_mapping_count no longer counts 1 mapping for sites with 0