Fixed Model Error on ID click
Merge conflict
Merge branch 'master' of https://github.com/jannickfahlbusch/fang