Fixed initial query order