replace search terms filter with combine fields filter in question and answer view
Merge remote branch 'origin/dev_oliver_stage'