I have only touched the Logs module because I am not sure if we have other places when it can trigger havoc or not. If we are sure that it does not break anything we can fix it a dbengine level