Fixing some issues with URL parameters