Only replacing search term in the select drop down if there is a search term.

Issue: GCP-9122
Reviewer: Rebecca (post commit)
Ensuring that the alias input is closed and any entered alias has been saved before selecting a variable.

Issue: GCP-9440
Reviewer: none