Hotfixes and collection sorting adjustment