Less queries
Fav and underdog fix