Few changes on the Web element Handling