Better implementation for favorites
small tweak