Fixed Call Query Order