Attempt to improve the indexing of the EDM macros

The EasyDropdownMacro seems to return null from time to time when used through the event (when changing the value in live on the page).

We have changed how the events are captured, i.e. we hope the parsing will be more accurate.