Eliminated extra queries for guests.