Use song track as an order fields
Add missing override directive