Adjusting Metadada queries