[OC-8419] optimize image listing to load only once.

Please review and merge.