making sure we don't regress on double quoting
bringing seession mockup in line with reality
cleaning up compat