Comment out query choices for now (move to other branch later)