Generic output

Refactor - get rid of tuples inside Filters,

add form output and prepare for json output
Reformat