- Updated blocks to better handle URL manipulation (Fixes #481)