improved dom node query