I wonder if we need a dedicated section or we can move these queries to the relevant section.