handle more tags - WIP