Engine: Fixes #3325: Initial fixes to get content search UI working.
Merge pull request #3235 from ehelms/engine-content-search

Engine: Fixes #3325: Initial fixes to get content search UI working.