CFY-279 fixed image retrieval