Upgrade CSW GetRecrod for better filtering