MLDS-312 Support better prefix searches