Better handling for scenario references, only halfway done
Finished previous commit

(issue: breaks some notifications)