Few more changes on PDA filtering steps