Refactoring of interface and search filters implementation
Added missing files