Reverted back to query autocomplete mechanism.