Added user_id to xml database entries.
A few xml clean_ups

Signed-off-by: Bennie Leonard <bennie.leonard@gmail.com>