FIX: Random-ordering caused wrong SQL-query