added query string to collector and updated tests