Fixing bug in dynamic filter and chaging so static variables can be used to run filter after nested repo mapping