Fix to admin ui manage fields handling