DisMax and EDisMax component refactoring