Revert "Moved sales queires into one call"

This reverts commit fdfb78b1a868f3821a72f1e869846cf9b69f89ec.
Added API fixes and fixed some time range issues.