updated todo with session filtering stuff