Cleaned the matching pipeline. vsone works correctly again. Querying seems much more stable based on tests. Data is loaded more efficiently