adjusted report generation work flow to seamlessly generate query based on parameters selected. Adjusted naming conventions