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