Fix interfaces, implement search by keyword dialog