Refactored search to use transformator