FIX: Fixed sorting with lazy loading

Signed-off-by: arturkandurengagepoint <artur.kandur@engagepoint.com>