Bugfix for TOC 505 parsing
Simplified code for TOC 505 parsing