Issue/735/use slug field

Fix #735