JS fixes
Data by proxy
Data by proxy