previous commit causes input field to be empty after selection. Reverted and ignored for now