Some refactoring applied. Still need small rename in SearchWheelEntity