Web: element selector refactoring