updated tag mapping
removing table mode for now due to mapping conflict
added comment