Improve matching adoptee search
Fix merge conflicst in adoptees.js