Fixes query for more advanced removal options