Subsite and escaping improvements