simplify and fix breakage for non signed in users