Better handling of web selector