Go back to DOM scanning and fix this issue once and for all