Fix queries without explicit joins
Make sure that fields are sorted in the UI
Bump version to 0.2.1-sd