fixed filter bugs
merg conflicts fixed
Merge branch 'development' of github.com:eiNetwork/eiNetwork2 into development