Add a macro to close connection
Add query filter, Add field selection to queries