Moving in the wrong direction

Reverting "Be more tolerant to missing entries"
Reverting "Support for sub searches on dynamo users"