Removed hack for has_one association
Fixed cannot update asset due to wrong asset_type