Add prefix completion
Add prefix completion
Bug fixes
Bug fixes