Limit return options of End Event

When defining an End Event with return type Object and a specific entity. It doesn't make sense other (non valid) options are displayed when typing the $. In the example below only the first option should be available. This shouldn't be too hard to implement I guess, however inheritance could complicate things a bit.