Add queries for detecting to be mapped metadata