fix a few conflicts with assets, consume assets key from api