minor code changes to simplify url changes