changed searchexpression handling