More fixes for issue #21 (ditched webNavigation/trying without DOMContentLoaded listener)