changed expression builder to use single attribute namespace and prefix in content