Ensure controller methods return updated entities #226

see #226