[TASK] rework the filter handling and metadata