Return matches as list instead of complete_add