Added some additional input filtering on query and param options