Changed filtering to detect additional class title format