Work in progress on fixing reporting for query match rule