better handling for element tags
0.0.4