RF-13804: Fixed non-completing select component