temporarily fix breaking psi report by using proper location hierarchy