Fix to Package search logic