don't duplicate location events and be more generous with key replacement
1.3.5