Fixing build, bug with DataFilterService