Setup a better wait selector for R000570