improve isbn search
Fix conflicts