Issues related to the billion laugh entity expansion which happened to
escape the initial set of fixes