Fixing bug and add filter part to configuration