Assets keys fix

@gevorg-gsar 
@david-daal