Move citizen find_or_create into DispatchController