Fix test_query_old!!!!!!!!!!!!!!!!!