The increasing prevalence of Non-Linear Loads (NLLs) inelectrical power systems, driven by devices like rectifiers, variable-speeddrives, and switch-mode power supplies, has introduced significant challengesin transmission systems and PV installations. The resultant voltage andcurrent harmonics disrupt the purity of power signals, emphasizing the needfor effective mitigation strategies. Shunt Active Power Filters (SHAPFs) haveemerged as promising solutions, with their performance dependent on factorslike inverter control, and reference current generation.This research study introduces a Modified Hysteresis CurrentController (MHCC) with a Dual Fundamental Component Extraction Algorithm(DFCEA) designed to enhance the current harmonic mitigation performance of aSHAPF based on a three-level T-type inverter (3LTI). The focus is on improvingperformance under non-sinusoidal voltage conditions, especially in the context ofa PV-linked T-type inverter-based SHAPF (PV-SHAPF). The DFCEA plays acrucial role in isolating fundamental voltage and current components, essentialfor synchronizing phases and generating reference currents tailored to meetPV-SHAPF requirements.