Refactor text_snippet finder method in helper
Merge branch 'new-site-integration' into staging