Changes to allow filtering based on extension mismatch