Fix deleteExpired bug and make user attributes searchable