Fixes for favorite