[#505 #507] Thumbnails fix