Fix some queries that may error out if a new colony is detected