Added habitat to queries