Repaired multiple dataset support for handset