Implemented expression replacement in discovery URL (#132)