Fix order filter fields and joins