Adding asset support to listing query