Fixed collection caching problem
Initial sorting