Removed legacy middleware
Added initial search implementation