AM-158: Add Reporting module support to Appointment Scheduling module
A few tweaks