Builder fix
Favorite filter fix