Field labels, fix sorting, other fixes