Fix unpinned queries re: @yahiko