Question from Fiona (in NZ) regarding visa application

Hi, we are New Zealanders and will be flying to the UK for a holiday on 21 May. On the way to the UK we are in transit in Shanghai for 4 hours. On the way back to New Zealand we are spending 7 days on holiday in Shanghai. We arrive Shanghai on 5 June and will leave on 12 June. My questions are:

1. Please confirm we need to apply for a Single Entry (and don't need to worry about our time in transit).

2. Regarding question "Expected date of your first entry into China on this trip".
I assume this is the date we arrive into Shanghai on the way home at the start of our 8 day holiday and I don't need to mention the time we are in transit on the way over.

3. Regarding question "Longest intended stay in China among all entries"
The answer to this is 8 days.

Thanks for your help :-)