Code refactoring and updating search with found Book