Refactor strconv import
Add simple search support