replace more tag-based selectors by id-based ones