Enhanced search contact
Minor changes
Add some tests
Test advanced label search