Reuse existing Modal if it's available + avoid using "global" context for "onPostComplete" event + misc minor fixes