Use `id` function for selection elements in two places that were not using it. Closes gh-463