Bug fixes to listing counts