Cleaned up Books query and DTO.