UC-30 Code cleanup and fixed problem with thumbnailer URL generation