Fixed dynamic content saving order to match element order