Ensure <rid> is first element in request xml

#5