Fix element ID attributes and  finder