Make sure tracking is always returned for all resources
Update FAQ