Fixed search query expansion not worked as expected