Array key fixes

When calling count_all() before find_all(), some table field names will be missing because of array key collisions.
Merge pull request #66 from geonymous/3.3/develop

Fixes for #4407 and #4517