Tag input working better