COMELEC targets voter registration to resume by June or July