refactor imports
fixing bug in report generation
merging script
Revert "Revert "bug in query" -- unit tests got broken"

This reverts commit e21ae581ae776c5868de95e37413a1100a72672a.
Merge commit '4ba7c81'
fixing bug in report generation - fixing merge