Sphinx Search 2.1.6 refactoring