Fix categories not showing on start
Fix NPE with few songs in category