Improved query, add removal