Tamed the names of the favorite columns
Fixed resource call
Merged changes