Additional data filtering fix