Various fixes for linked selectboxes to use the new data structure