Concerning [1]: I take for granted that you understand why I made my edit. Do you have any better solutions than mine? The probleme with t:senseid is that only one definition under Etymology_2 i highlighted.
The solution depends on the problem we're trying to solve. If the goal is to guide the user towards the right section, then {{senseid}} could probably be used in the etymology section instead of next to a sense.
