nohead small optimize
dont crush on null favorites
Merge remote-tracking branch 'upstream/master' into lock