#14438
Fixed numerous errors, render speed of the pages also should improve
#14438