Updating demo to work for all sites/sections