Fix remove so it works with queries.
Merge pull request #10 from Battlefy/fix/remove-queries

Fix remove so it works with queries.