Remove default category scope and fix badge caching