Tried to update query

Added support for multiple arguments and catalysis, not yet tested