Fixing incorrect display of query arguments