#50 Performance fix for /starred