modifications to query assets correctly