Add fields for content search and refactor content filtering