Rename method names, refactor buildContentStateCondition to take FilterContraints