Adding query-paremeter validation functionallity