better selection in case of api changes