support for optional params
cosmetics
fix references with a different id