Working views with wrong id in detail.
Merge remote-tracking branch 'origin/master'