Fixed search and items issues