clean up build query string. messy