BUGFIX: Behavour consistent over multiple page loads, was previously failing if the browser was not refreshed
BUGFIX: Removed dependency on map field and ensured JS is loaded each time (templates appear to be loaded only once)