Fixes for category listing

Fixes for category listing