fix order_by_popularity and gmail password