Fixed issue with passing custom options over to per-tenant schema