change the fix to prevent the dupliquates queries in a way to stay compliant with the tests