Added queries for taxa with or without structures.