changed conditions to deal with no count limit present
Merge branch 'default-count-fix' into all-custom-extensions