public streams page optional
fix merge