Define scope of StaticFieldReference

Hello everyone

I have a root concept that has two children:

1. An extension of a GenericDeclaration with a StatementList as a child
2. An extension of a ClassConcept

Now I want to access static fields of the ClassConcept in the StatementList, but there are two problems:

1. Autocompletion shows me all the ClassConcepts from all files that I have defined in the project, not just the one from this file. I would like to restrict it to only ClassConcepts from the same file. I feel like I would need to change the scope of StaticFieldReference, but because this is a BaseLanguage concept I don't know how to achieve this.
2. After selecting a field from the autocompletion menu, the ClassConcept has the error "The reference <name> (classifier) is out of search scope". I don't know why this is happening. The static field itself does not have an error.

I would be very grateful for any help in this matter.