Fix: Sort at wrong place
Fix: sql syntax error (field were renamed)