Fix field selector
Merge branch 'fix_text_field'