Redoing resolution parsing in PDB and handling better hybrid entries