fix non-word char search
add todo