Faster Feature List (fixes #1604)