Remove should work with queries (as well)

[tracend]

As setting axis is not as direct as it used to be, usually we'll be calling remove to actually refer to a query.

In such cases the library will need to look up the queries and remove references there as well.