Adds search by item name and small refactors.