Fixed an issue with sort_query + joins, made defer_except not accept relationships