Update feature: Cleanup typeahead and added custom hidden field support