search dialog issues
Merge branch 'master' into fromFB