Fixed broken logic re feature counts