BUG Fix: not sorting results anymore
Merge commit '10984d6d5094535' into production