Retrieve the filter by schema handler and fix the cp content field reference handler.
Merge pull request #1924 from openscholar/1919

Retrieve the filter by schema handler and fix the cp content field reference handler.