Test and fix (ahem) removing labels by query
Test replacing labels