NXP-13256: make 'query' parameter not required as we now use page providers also