Improve finding of document parts