1. added resources filtering
2. adjusted properties