Adding tags with query token input