[BUGFIX] Adjust category selection in TCA and Flexform for Accomodation