Add support for spaces etc in extract()