Adding the filters to the core module
Merge branch 'develop'

* develop:
  Adding the filters to the core module