Upgrade CSW GetRecrod for better filtering -- 2nd try