Fix import error from rebase

slight code cleanup as well, remove projection from compliance
data query