make favorites plural to remove confusion around bug 170
Merge branch 'bug170' into clx_dev