fix searching on predefined address fields