mark todo
add phone number lookup before filter
Merge branch 'refactoring'