add one more key mapping and improve Addtags function