Updating model findOne methods and mappings
Added backup mapping support to the mapping_count helper and fixed some edge case issues
Fixed controls mapping counts