Updated client to use new tag search behaviour