working on new UI (SearchBuilder)
Bug fixes