Fix absolute numbering & filtering & availability