Make sure question mark is included in query string