Better handling for inpost tables