Hotfix: fix performance problems with calculated indicators, handled circular references