Merge "Fixes query logic when not instant" into rvc-dev