Removed need to join against ref table, small speedup