Tdh merged 2

Agreed that its clunky... can you expand on your suggestion a little bit? (Tried to roughly model this off how the sort values are searched now)