Improved ranking to handle draw state