Updated to handle HTML files in other folders (ie Maven layout). Also fixed issue where an element with both data-field and id the same value would cause the element to not be found.