Refactored the find-en fn to use query.