Fixed a big JARED bug and fixed handling of querystring vs. options