Some cleaning
Cont. query parameters