Refactored auto-suggest to a category; expand demo