fixed problem with expanded resources and criteria parameters
Merge branch 'development'