[Backport 2.15] move deletion of query index before its creation

[Backport 2.15] move deletion of query index before its creation #1672