Add query params support for some strange situations