Updating entrust to have indexes, updating filter to use proper function, updating role messages.