Added GetTagById and fixed mapper