Added empty filter interface
Fixed some errors