Bugfixs & facets