Fix group sorting, attempt to improve book categorizing,