Update/revise Popcorn, add strict URI-parameter mapping