Make Logicats work in Faves and non faves

Also small performance improvement
Merge pull request #804 from waveney/wav25

Make Logicats work in Faves and non faves
Merge pull request #1 from eternaldensity/master

If you see this, I did somthing wrong