bug fixes after merge

madaming ipis lumabas pagdating ni extractor