Added default 'NoQuery' value