Fix newer SQL
Extra fieldtypes, favourites work