Ensure query values are properly determined even when keyword inside word