BZ-12444 Moved image lookup to markup