Updated DOM search