Improved url includes and allow multiple tables.