diff --git a/pylot/core/io/phases.py b/pylot/core/io/phases.py
index ac0dff38..b7e23837 100644
--- a/pylot/core/io/phases.py
+++ b/pylot/core/io/phases.py
@@ -862,7 +862,11 @@ def merge_picks(event, picks):
         network = pick.waveform_id.network_code
         method = pick.method_id
         for p in event.picks:
-            if p.waveform_id.station_code == station and p.phase_hint == phase:
+            if p.waveform_id.station_code == station\
+                    and p.waveform_id.network_code == network\
+                    and p.phase_hint == phase\
+                    and str(p.method_id) in str(method)\
+                    or str(method) in str(p.method_id):
                 p.time, p.time_errors, p.waveform_id.network_code, p.method_id = time, err, network, method
         del time, err, phase, station, network, method
     return event
diff --git a/pylot/core/pick/autopick.py b/pylot/core/pick/autopick.py
index 7d1d0b28..158704aa 100644
--- a/pylot/core/pick/autopick.py
+++ b/pylot/core/pick/autopick.py
@@ -776,7 +776,6 @@ def autopickstation(wfstream, pickparam, verbose=False,
                 ################################################################
                 # get Wood-Anderson peak-to-peak amplitude
                 # initialize Data object
-                data = Data()
                 # re-create stream object including both horizontal components
                 hdat = edat.copy()
                 hdat += ndat
@@ -795,7 +794,6 @@ def autopickstation(wfstream, pickparam, verbose=False,
             ############################################################
             # get Wood-Anderson peak-to-peak amplitude
             # initialize Data object
-            data = Data()
             # re-create stream object including both horizontal components
             hdat = edat.copy()
             hdat += ndat