datamapper update && catalog teachers fix