Moved {model}/{id} route further down th eline as it was capturing {model}/new, {model}/update_options and {model}/file routes.
This could be seen when trying to retrieve an image in the edit dialog as the image was never being served.
I believe this was introduced when the requirement that the {id} portion of the route be a digit was removed in commit 688f0c3d1aa73403ac9e47d2fbff716b7813ac33.
When a model has bindings by default for it's standard query we need to merge the Model's query with our count query so that it has the bindings required to complete the count.
Merge branch 'dev'