Remove unsafe value returned as pointer, add search feature