Search Core fixes