fix: architecture condition not applied when querying image rows (#2989)

fix: architecture condition not applied when querying image rows (#2989) #16788