fixed aff detection bug and streamlined journal Selector