improving options / query params implementation