Refactoring to use Autofac integration and wiring up search query.