Updated Generated JSON's and added new filters