Conform to new server results, fix display bugs