added struct filtering