New queries and organisations_megatable classification work