Fixed some javascript bugs related to switching to uuid