Add basic completion and search to command