Do not use last, use lastOption, which is safe
Consistent naming
Merge pull request #6642 from guardian/fix-tags-issue

DFP: Do not use last, use lastOption, which is safe