Fixed quoting bug.
Only fetching nested attributes when not in collection.
Optimized loading to avoid redundant round trips.