Fixed criteria used to load
Merge pull request #62 from sergeyklay/fixes-1

Fixed criteria used to load