simplify/tidy-up question tags