Split request/user
Improvements to sample data / fix defect in audit trigger