further 2.2 text, more index functionality