fix whitespace matching during block upgrades
gardening: remove traling whitespaces