Do I need visa for 12hr layover into Shanghai?

US citizen. I flew into Shanghai on route to Bali, with 22hr layover. I read that I did not need visa to explore city but, on arrival I was told that I did need 24hr-144hr twov. I had to go to special line at immigration. Now I am nervous about my return flight, which has a 12hr layover.