more updates to correctly replace search items on load