Enhanced search contact
Minor changes
Add some tests