Fixing selected state for select field