merge back sphinx

full-text search