Fix order query. Use string instead of hash