Page element selector improvements