Improve mapping for tags functions.