Improved the case of multiple assets on the same site