Fixes FakeRequestWrapper

- NativeSql.addIf enhancements