Add option to edit an existing query

Currently a query can only be added and removed. But in some cases, the queries can be more complicated and would be easier to have an 'Edit' button to add/remove only the desired part of the query without having to copy and re-paste the whole query.