Really fix the completer for common prefix