Proper updates for `cairo` searching