query change and argument optional