fixes for macro handling with portable uris

also fixes jplayer macro regex