fix. handling of query string in url first filtering.

Change-Id: I95e3f2a3b7f9768c3229298432325302804b62f1