Address issues with element selection.