Improvements on load by category