Update c.j.j
Make find-all more generic