fixed toggle. custom selection works as expected