Switched to batch WI query + added highlight