Working on search bugs