Many changes that I forgot to commit. Last is validate-category for requests.

Many changes that O forgot ro commit. Last is validate-category for requests.