Handled space issue in tags