Added the full text availability criterion, plus ability to remove a constraint