Added filter by kind
Added populate rake
Refactoring filter