[#2022] add resource hierarchy to specific query to bring it inline with our table structure