CORE-235 fixes for filters, table filters and saving template logic