UI: Changes including error handling on faceted