this fix implements usage of uri.query if it exists