Public stmts filter layout redone