Changed back previous commit regarding default value for queried