Rework buildThumbUrl() and getThumbUrl() methods