Another search related fix. More to come