actually seems that checking the type here is heavy handed, I think we can just let query date picker behave like it would behave and just use this as a wrapper.