Several attempted fixes to add Oncomplete for filtered search