Improved selector handling
Updated selector search in webpage