Mario, Sush | #1524 | making autocomplete generic