Added overlay check on search add
Merge branch 'devsetup' into gh-pages