WIP: merge request for #21783

What does this MR do?

fixes bug that prevented @group and @Project objects to be defined by moving the earlier return after objects were defined.

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

filter selected option would always appear as 'ANY'.

Screenshots (if relevant)

https://media.giphy.com/media/26ufeK22J82TpRFZe/giphy.gif

Does this MR meet the acceptance criteria?

• [ x] CHANGELOG entry added
• Documentation created/updated
• API support added
• Tests
  • [x ] Added for this feature/bug
  • [ x] All builds are passing
• Conform by the merge request performance guides
• Conform by the style guides
• Branch has no merge conflicts with master (if you do - rebase it please)
• [x ] Squashed related commits together

What are the relevant issue numbers?

Closes #21783 (closed)