Revamp to search by word