Better field handling and select box now brings in correct options