Various changes + mixed book search