search advanced fixes