Fix for runing on server & table_scan results correct order