LPS-31497 and LPS-33069 - Unexpected behaviors in pages of sites created from site templates

@jcampoy