Make Logicats work in Faves and non faves

Also small performance improvement