Fix specs, add validation
Remove range_key query restriction